From 4eece537a365a393e1b8f59f87ed6bbf45e13564 Mon Sep 17 00:00:00 2001 From: Joshua N Pritikin Date: Tue, 11 Sep 2001 04:27:53 +0000 Subject: [PATCH] minor fixes --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtktextview.c | 4 ++-- gtk/gtktreeview.c | 3 +++ 9 files changed, 61 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fef88189ee..c840c98811 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Sep 10 21:26:24 2001 Joshua N Pritikin + + * gtk/gtktextview.c (gtk_text_view_set_buffer): Make + (add|remove)_selection_clipboard symmetric. (bug #59836) + + * gtk/gtktreeview.c (gtk_tree_view_unref_and_check_selection_tree): + Avoid SEGV for empty tree. (bug #60243) + Mon Sep 10 20:47:22 2001 Tim Janik * tests/testgtk.c (create_idle_test): slight fix for diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fef88189ee..c840c98811 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Mon Sep 10 21:26:24 2001 Joshua N Pritikin + + * gtk/gtktextview.c (gtk_text_view_set_buffer): Make + (add|remove)_selection_clipboard symmetric. (bug #59836) + + * gtk/gtktreeview.c (gtk_tree_view_unref_and_check_selection_tree): + Avoid SEGV for empty tree. (bug #60243) + Mon Sep 10 20:47:22 2001 Tim Janik * tests/testgtk.c (create_idle_test): slight fix for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fef88189ee..c840c98811 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Mon Sep 10 21:26:24 2001 Joshua N Pritikin + + * gtk/gtktextview.c (gtk_text_view_set_buffer): Make + (add|remove)_selection_clipboard symmetric. (bug #59836) + + * gtk/gtktreeview.c (gtk_tree_view_unref_and_check_selection_tree): + Avoid SEGV for empty tree. (bug #60243) + Mon Sep 10 20:47:22 2001 Tim Janik * tests/testgtk.c (create_idle_test): slight fix for diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fef88189ee..c840c98811 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Mon Sep 10 21:26:24 2001 Joshua N Pritikin + + * gtk/gtktextview.c (gtk_text_view_set_buffer): Make + (add|remove)_selection_clipboard symmetric. (bug #59836) + + * gtk/gtktreeview.c (gtk_tree_view_unref_and_check_selection_tree): + Avoid SEGV for empty tree. (bug #60243) + Mon Sep 10 20:47:22 2001 Tim Janik * tests/testgtk.c (create_idle_test): slight fix for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fef88189ee..c840c98811 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Mon Sep 10 21:26:24 2001 Joshua N Pritikin + + * gtk/gtktextview.c (gtk_text_view_set_buffer): Make + (add|remove)_selection_clipboard symmetric. (bug #59836) + + * gtk/gtktreeview.c (gtk_tree_view_unref_and_check_selection_tree): + Avoid SEGV for empty tree. (bug #60243) + Mon Sep 10 20:47:22 2001 Tim Janik * tests/testgtk.c (create_idle_test): slight fix for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fef88189ee..c840c98811 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Mon Sep 10 21:26:24 2001 Joshua N Pritikin + + * gtk/gtktextview.c (gtk_text_view_set_buffer): Make + (add|remove)_selection_clipboard symmetric. (bug #59836) + + * gtk/gtktreeview.c (gtk_tree_view_unref_and_check_selection_tree): + Avoid SEGV for empty tree. (bug #60243) + Mon Sep 10 20:47:22 2001 Tim Janik * tests/testgtk.c (create_idle_test): slight fix for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fef88189ee..c840c98811 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Mon Sep 10 21:26:24 2001 Joshua N Pritikin + + * gtk/gtktextview.c (gtk_text_view_set_buffer): Make + (add|remove)_selection_clipboard symmetric. (bug #59836) + + * gtk/gtktreeview.c (gtk_tree_view_unref_and_check_selection_tree): + Avoid SEGV for empty tree. (bug #60243) + Mon Sep 10 20:47:22 2001 Tim Janik * tests/testgtk.c (create_idle_test): slight fix for diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 3a70646c51..82a3e57452 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -1084,8 +1084,8 @@ gtk_text_view_set_buffer (GtkTextView *text_view, G_CALLBACK (gtk_text_view_mark_set_handler), text_view); if (GTK_WIDGET_REALIZED (text_view)) - gtk_text_buffer_remove_selection_clipboard (text_view->buffer, - gtk_clipboard_get (GDK_SELECTION_PRIMARY)); + gtk_text_buffer_add_selection_clipboard (text_view->buffer, + gtk_clipboard_get (GDK_SELECTION_PRIMARY)); } if (GTK_WIDGET_VISIBLE (text_view)) diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 1e6b7e8ece..52dbb4b656 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -5308,6 +5308,9 @@ gtk_tree_view_unref_and_check_selection_tree (GtkTreeView *tree_view, GtkRBNode *node; gint retval; + if (!tree) + return FALSE; + node = tree->root; while (node && node->left != tree->nil) node = node->left; -- 2.30.2